Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: syntax error when running prettier on blade files (resolves #2338) #2339

Merged
merged 5 commits into from
Oct 31, 2024

Conversation

jobara
Copy link
Collaborator

@jobara jobara commented Oct 29, 2024

Resolves #2338

  • Fixes syntax issues in blade files that were preventing prettier from running
  • Runs prettier on CSS, JS, and Blade files

NOTE: Currently eslint-config-prettier hasn't been updated to support eslint stylistic rules; which means that there is now a conflict between linting and prettier. This is seen in the datePicker.js file for the indentation of the switch/case. For now these are left to work with eslint's rules. See: prettier/eslint-config-prettier#272

Prerequisites

If this PR changes PHP code or dependencies:

  • I've run composer format and fixed any code formatting issues.
  • I've run composer analyze and addressed any static analysis issues.
  • I've run php artisan test and ensured that all tests pass.
  • I've run composer localize to update localization source files and committed any changes.

If this PR changes CSS or JavaScript code or dependencies:

  • I've run npm run lint and fixed any linting issues.
  • I've run npm run build and ensured that CSS and JavaScript assets can be compiled.

@jobara jobara added this to the 1.5.0 milestone Oct 29, 2024
Copy link

codecov bot commented Oct 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.34%. Comparing base (8f792d2) to head (5fb6d3c).
Report is 3 commits behind head on dev.

Additional details and impacted files
@@            Coverage Diff            @@
##                dev    #2339   +/-   ##
=========================================
  Coverage     97.34%   97.34%           
  Complexity     2188     2188           
=========================================
  Files           338      338           
  Lines         10199    10199           
=========================================
  Hits           9928     9928           
  Misses          271      271           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@greatislander greatislander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question in here, but looks fine otherwise.

<x-contact-point type='email' :value="$engagement->connector->contact_email" :preferred="$engagement->connector->preferred_contact_method === 'email' &&
$engagement->connector->contact_phone" />
<x-contact-point type='email' :value="$engagement->connector->contact_email"
preferred="{{ $engagement->connector->preferred_contact_method === 'email' && $engagement->connector->contact_phone }}" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we sure this works? I think I remember there being a distinction where Blade components couldn't use this syntax but can't find documentation on it now.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have tried to test all these types of changes and I believe they are working. For example I was able to get the appended (preferred) to flip between email and phone by changing the related setting. It's worth testing out at least one of these changes again though. I think maybe org or fro contact might be easier.

@greatislander greatislander self-requested a review October 31, 2024 17:36
@jobara jobara merged commit 970a49c into accessibility-exchange:dev Oct 31, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Syntax error when trying to run prettier on some blade files
2 participants